restructure requirements files
update travis config to use correct requirements file
Merge pull request #20 from webkom/requirements

restructure requirements files
changed value required to update
Merge branch 'master' of github.com:webkom/coffee
ugly hack to fix it not updating to the "off state" due to capcitor never fully recharging when light is off
fixed the ugly hack, made it even uglier by adding a global variable
replaced ugly and not working hack with simple and (hopefully) working hack
fixed small syntax error
fixed another small syntax error
Update coffee.js

bugfix
update makefile
Update index.jinja2

fixed for consistency
Merge branch 'master' of github.com:webkom/coffee into angular

Conflicts:
	coffee/static/coffee.js
	requirements.txt