adding missing --dev flag to travis build config
Merge branch 'master' of https://github.com/mrkrstphr/branches

Conflicts:
	README.md