Going to a new branch for settings work
Now that I actually run the paperclip generate the local version works now to go s3
Logo now working
Fixed JS for the top area
Ready for heroku
Merge branch 'settings'