Merge pull request #83 from dylan8902/development

upgrading rails and ruby
Merge pull request #84 from dylan8902/development

Development
Merge pull request #85 from dylan8902/development

adds squares, image for ip-tools and changes pagination
Merge pull request #87 from dylan8902/development

fixes #86 adds default scope for stuff
Merge pull request #90 from dylan8902/development

fixes #88 new Google+ url
Merge pull request #91 from dylan8902/development

fixes #88 new Google+ url
Update static_pages_controller.rb
Merge pull request #92 from dylan8902/master

Development