start flask migration
Merge branch 'master' of github.com:cooperhewitt/palette-server into flask

Conflicts:
	bin/palette-server.py
Merge branch 'flask' of github.com:cooperhewitt/palette-server into flask

Conflicts:
	flask/server.py