don't ignore the lockfile
Merge branch 'master' of github.com:surprisehighway/laravel-base
remove js min stuff
add Guardfile