devise installed and tested, also generated models
Merge branch 'master' of github.com:nicdev/sbw

Signed-off-by: Nic Rosental <nic@epiclabs.com>

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	Rakefile
	app/views/layouts/application.html.erb
	config/application.rb
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/session_store.rb
	config/routes.rb