Fixed an embarrassing merge error from waaay back. Didn't disrupt operation but caused funny error messages in the log.

Thanks to @nophead for reporting this.

Closes #433
Create CONTRIBUTING.md
Bug fix for Emergency Stop
Merge pull request #475 from Salandora/master

Bug fix for Emergency Stop
Insert src folder at first position of sys.path
Insert src folder at first position of sys.path
Merge branch 'master' into devel

Conflicts:
	src/octoprint/server/ajax/control.py
Versioning by versioneer: https://github.com/warner/python-versioneer/
About time to declare this as a stable version, should have done this ages
ago...
Merge branch 'master' into devel

Conflicts:
	setup.py
Removed left overs from old VERSION tracking
(cherry picked from commit 603f667)
Fixed setup.py to correctly work with versioneer
Added clean command to setup.py
Version resource on API with API and software version
Submit login form upon enter in password field, switch to password field upon enter in username field
Another try at fixing #476
Also update the metadata correctly when an analysis finishes

Closes #476 for good
merge latest devel branch