merge changes from develop into master
update readme to reflect project
Merge branch 'master' of github.com:chrisaspringer/spiker into backbone

Conflicts:
	README.md