Merge pull request #169 from codeforamerica/andyV1.1

Changes to get running on heroku
added formbuilder.js to application.js
restructured application.js