Merge branch 'tinymce' of github.com:purple-martins-2013/storyward
Merge branch 'master' of github.com:purple-martins-2013/storyward
integrate guard with unicorn, create procfile
integrate guard with unicorn, create procfile
Merge branch 'herokuize'
integrate guard with unicorn, create procfile
Merge branch 'herokuize'

Conflicts:
	Gemfile
integrate guard with unicorn, create procfile
Merge branch 'herokuize'
use asset pipeline helpers for urls in css
Merge branch 'herokuize'
Merge branch 'formatting' of github.com:purple-martins-2013/storyward