Merge branch 'master' of https://github.com/k4gdw/roundhouse

Conflicts:
	README.markdown
Merge branch 'master' into dev

Conflicts:
	README.markdown
Merge branch 'dev' into TriggersFolder