Changed to universal analytics
Merge pull request #25 from obduk/universal_analytics

Changed to universal analytics
Add uid to google analytics
Merge pull request #26 from obduk/ga_userid

Add uid to google analytics
Added assets section to Gemfile
Added haml-rails gem
Removed combined development test group from Gemfile
Removed unneeded entry from Gemfile
Removed uneeded comment
Revert "Removed unneeded entry from Gemfile"

This reverts commit 1c8adad51bcb6dbcf0d98d6dd8e072c6483cf6ab.
Don't require travis-lint in Gemfile
Merge pull request #27 from obduk/cleanup_gemfile

Cleanup gemfile
Changed rbenv capistrano config
Merge pull request #28 from obduk/rbenv-capistrano

Changed rbenv capistrano config
Upgraded gem
Updated css for bootstrap 3