initial travis-ci push
travis ci update
Merge branch 'master' into hashmap

Conflicts:
	Gruntfile.js