Controller works with new hack_db
Fixing pull/ush errors
Merge branch 'master' of https://github.com/joshuagordon/hackflix_summer_2013