Fixes issues on 14.04
Merge branch 'master' of github.com:cbetta/dokkufy

Conflicts:
	README.md