Merge branch 'dev' into bootstrap3
Small amount of b3ification when merging dev into b3 branch
b3ified some of the forms
b3ify and improve design of edit profile page
b3ify the signup/signin pages
add secret key to travis config (needed for devise update)
err, make that secret token
Fixed typo
b3ified a few of the lesser-used forms
got rid of ugly scaffolding 'back' links
Merge pull request #385 from Skud/b3forms

Fixed various forms to be bootstrap3-ified
Merge remote-tracking branch 'upstream/bootstrap3' into dev

Conflicts:
	Gemfile.lock
Merge branch 'dev' into bootstrap3
Switch to match_array to get around spuriously failing tests
Merge pull request #390 from Skud/cropwranglertests

Switch to match_array to get around spuriously failing tests
Merge pull request #389 from Growstuff/bootstrap3

Bootstrap3