removed stuff
Merge branch 'master' of https://github.com/devpointlabs/DPL-Site

Conflicts:
	app/assets/javascripts/theme.js
	app/assets/stylesheets/vendor/entypo.css
	app/assets/stylesheets/vendor/flexslider.css
	app/assets/stylesheets/vendor/font-awesome.css
	app/assets/stylesheets/vendor/font-awesome.min.css
	app/assets/stylesheets/vendor/icomoon.css
	app/assets/stylesheets/vendor/ionicons.css
	app/assets/stylesheets/vendor/ionicons.min.css
	app/views/courses/ruby_on_rails.html.slim
changes for saltlake page