* Changed sites_controller to add a config method
* Got links on the index.html.erb working
* Updated routes.rb as some were broken
* JekyllFileReader.rb made wrong assumptions when parsing files
Merge branch 'master' of https://github.com/kieransenior/PressUp

# By deedoubleyou
# Via deedoubleyou
* 'master' of https://github.com/kieransenior/PressUp:
  Work to get properties working and fixed some Rails warnings
  Paired programming work. Updated Gemfile to Rails 4

Conflicts:
	config/routes.rb
	lib/pressup/JekyllFileReader.rb