git ignore oops
changed up the package.json, default APP_ENV, specify bower directory as vendor as opposed to default
Merge branch 'master' into test-s3