added upstart script; made 'extras' dir
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md