Changes and stuff
Merge branch 'master' into improving-specs
Flash messages working, improved routes