rework url storage
beginning storage refactor
Merge branch 'master' of github.com:Amber-Elk/jetgrizzly into storage-refactor

Conflicts:
	.gitignore - kept mine (already included all Liam's)
	app/styles/main.scss - kept Rishi's
fixed travis testing environment
Merge pull request #8 from TGVarik/storage-refactor

Beginning of storage refactor