edited flash messages
Merge branch 'changingMessages'
Merge branch 'master' of github.com:slateapp/slate
rspec fixes for changing flash notices
Merge branch 'master' of github.com:slateapp/slate