move the user nav items to the right
Merge branch 'master' of https://github.com/maffamatgmaildotcom/network
upgrade to Ruby 2.0, Rails 4 (Bootstrap 3)
gems for heroku