Merge branch 'master' into travis-ci
fixed a space
getting closer
added export to encrypted lines
Merge branch 'master' into travis-ci
removing travis-ci
Merge branch 'master' into travis-ci

Conflicts:
	Gemfile
Merge pull request #81 from whoisglover/travis-ci

Removing Travis ci