Merge pull request #2 from TeamAmalgam/new-alloy-build-system

Use the latest version of alloy with the new build system.
Update the gitmodules to point alloy at bitbucket.
Merge branch 'master' into overlapping-gia