changed readme + changed out-of office conditions
cleaned up unecessary files
added so index displays correct time zone
added so index displays correct time zone
Merge branch 'master' of heroku.com:stackhausstaging into staging

Conflicts:
	views/index.erb
changed time zone settings
changed time zone settings
Merge branch 'master' of heroku.com:stackhausstaging into staging
Merge branch 'master' of heroku.com:stackhausstaging into staging
Merge branch 'master' of heroku.com:stackhausstaging into staging
times should display with localtime? hopefully?
test