Edit styles
Merge branch 'master' into dev
Merge branch 'master' into dev

Conflicts:
	public/styles/styles.css
	public/styles/styles.styl
Change references to jQuery into references to Zepto
Convert templates into JS to avoid RequireJS issues
Change how views use templates to deal w/ RequireJS issue
Specify host for io.connect()
Remove references to jQuery
Add PhoneGap version of index.html for porting