commenting out aws stuff for now
Merge branch 'master' of github.com:whostolemyhat/pollencount

Conflicts:
	server.js
transitions