Old build

Deleting all of this branch and moving master as of 12/09/2014 over to
here.