updted the header for the application to match with the request for iss78. Still need to fix styling
application.html.slim ul.nav.navbar-nav.pull-right
Merge branch 'master' of github.com:devs-for-change/main-site into develop

Conflicts:
	app/views/layouts/application.html.slim
Merge branch 'develop' of github.com:devs-for-change/main-site into develop
add paperclip local stuff, and fix up max-width
Merge pull request #24 from devs-for-change/nb/cleanup/paperclip_local_and_max-width

Cleanup