Merge pull request #163 from andrba/master

Created a users_to_follow method in the User model. Tests included
Security fixes and remove feeds
Remove annotate
update styles to keep tag labels inside their container. fixes #162
Merge pull request #165 from johnthepink/fix-overlapping-tags-on-view-sit

Fix overlapping tags.
Merge pull request #164 from danbartlett/fixes-and-feeds

Security fixes for sit content, and remove old feeds. Also drop auto-annotate
add edit profile link on profile page. closes #161
fix styles for diary entries on mobile. fixes #159
Merge pull request #166 from johnthepink/add-edit-link-to-profile

Edit profile link
Merge pull request #167 from johnthepink/fix-mobile-diary-indent

Diary entires mobile fix
Updated rails to 4.1.8
Renamed public scope to communal to avoid class method clash
Upgraded ruby to 2.1.5
Use new travis env for faster tests and bundler cache
Merge pull request #168 from andrew/master

Updated rails to 4.1.8
Merge pull request #169 from andrew/ruby-upgrade

Upgraded ruby to 2.1.5
Merge pull request #170 from andrew/travis-update

Use new travis env for faster tests and bundler cache
Add image to sit comments
Add delete comment functionality.
Merge pull request #172 from johnthepink/add-image-and-delete-button-to-comments

Add image and delete button to comments. Fixes #157