add primary build to master

merge dev into master - simple code builds and tests cleanly

![screen shot 2014-04-07 at 1 51 19 pm](https://cloud.githubusercontent.com/assets/4360430/2635461/a8594738-be85-11e3-8117-ad2efbcf0ab5.png)