Cleaned up vars
Moving to npm-run-script for Travis to prevent negligence