We won't be supporting aimake.
Merge branch 'upstream'

Conflicts:
	.travis.yml
Revert "Add travis build rules to build with aimake."

This reverts commit f0e9ac7bb9bbafe0b987c798fb75f13c458e2c34.

Conflicts:
	.travis.yml