Merge branch 'travis' into feature-fielddb-integration

Conflicts:
	Gruntfile.coffee
shimming fielddb

Conflicts:
	app/scripts/main.coffee
can build and use fielddb if outside of require

workaround for

fixes #43 and  fixes OpenSourceFieldlinguistics/FieldDB#1760
Merge branch 'master' into feature-fielddb-integration

Conflicts:
	Gruntfile.coffee
	app/scripts/main.coffee
Merge pull request #62 from cesine/travis

More changes due to travis integration
Merge pull request #63 from cesine/feature-fielddb-integration

Feature fielddb integration
running only on master