Update email.rb
Merge pull request #153 from ZucchiniZe/patch-1

Update email.rb
Remove unused code from Person.
Update the testing section on readme.
Added shields.io badge support
Not all font awesome icons are the same width and heigth. Because of this, dropdown navbar list item labels are not aligned since they are to the right of the icons. To fix this, I explicity set the width and height each icon will take, so that the labels will align.
Merge pull request #158 from BKStephens/master

Not all font awesome icons are the same width and heigth. Because of thi...
Remove description on Google Group in readme.
woops
Add ImageMagick requirement to README
Merge pull request #159 from speric/imagemagick

Add ImageMagick requirement to README
Merge pull request #156 from ZucchiniZe/patch-3

Added shields.io badge support
Upgrade to Rails 4.1.4

* Upgrades Rails to `4.1.4`
* Upgrades `will_paginate` to `3.0.7`
Spec and fix for Administration::DashboardsController
Add secret_key_base to travis.yml
Remove old disable_implicit_join_references setting.

http://guides.rubyonrails.org/4_1_release_notes.html

> Remove implicit join references that were deprecated in 4.0.
Reorganize all Concerns [fixes #163]
Made Footer Link NoFollow

Issue #169
Updated Hash Syntax

Issue #169
resolved merge confilct