update the bundle, streamline the buttons
 - update to capybara 2.0
 - move spec/requests/ to spec/features/
 - update a few tests to capybara 2.0 feature/scenario syntax
NOTE: requires brew upgrade phantomjs on Mac OS X
fix test thanks to capybara 2.0 and by adding a proper id. Fixes #4.
clean up settings, remove obsolete setup_area from generator, add script/ directory
Merge branch 'master' of github.com:amahi/platform into front-end-cleanup

Conflicts:
	app/views/users/index.html.slim