Moving local changes to asa's fork.

See the wiki for information regarding changes made to the asa fork. This request has been rebased with axiom's master branch to allow for (hopefully) seamless merging.