How to upstream

[paddybyers]

A couple issues to be decided:

1. to migrate to 0.5.x or 0.6.x first, before attempting to upstream, or not?

2. to attempt to upstream the build system, or just the changes to the common files?

[paddybyers]

The master-android branch has now been added, which is the Android port for master.

So the upstream effort should probably concentrate here; there's not really any point in upstreaming 0.4 if there is soon to be another stable release.

[paddybyers]

Since gyp now supports Android, I will be removing the .mk files and using gyp to generate them, pushing any changes needed to the gyp files.