Added grunt, jshint, cleaned up js, combined app and controllers