Merge pull request #31 from yvesvanbroekhoven/master

Fixing non-page routes by @fd not @yvesvanbroekhoven ;)
Updated mini_magick
Updated pg
Updated fog
UPdated redcarpet
Merge pull request #32 from mrhenry/fd-updates-gems

Updates gems
Fixed the user migrations
Added badges
Update README.md
Added country-select
Revert "Updated fog"

This reverts commit ff3b0faff4ca1af557285a11ad7aceeaa53d4a2c.
Added tests for file uploading
Prevent double migration loading
Remove some old css
Merge branch 'master' of github.com:mrhenry/lalala-ng
Better page routing
Merge branch 'master' of github.com:mrhenry/lalala-ng
Fiex the page loader