Initial commit
Added Travis CI config file
Merge remote-tracking branch 'OnCivic/master'

Conflicts:
	.gitignore