add waffle.io badge
Merge pull request #139 from waffle-iron/develop

add waffle.io badge
moving badge
Merge pull request #140 from ChristianMurphy/develop

moving badge
creating venture model

moving app files into app folder
cleared out three.js content
more attempted fixes
it works now!

thanks @bammons
ignoring static files
fixes to jshint ignore for updates
added help content
Merge pull request #141 from beccannlittle/develop

cleared out three.js content
Merge pull request #143 from davisk/develop

added help content
making unit tests work
Merge branch 'develop' of https://github.com/ChristianMurphy/gateway into venture-model

Conflicts:
	gateway/static/js/Makefile
	gateway/static/js/Models/.DS_Store
	gateway/static/js/Models/robotDude.js
	gateway/static/js/bootstrap.js
	gateway/static/js/bootstrap.min.js
	gateway/static/js/gateway.js
	gateway/static/js/index.html
removing refrences to ventures
removing ventures tests
style fix in test suite
removed extra blank line
allow failures in pypy