Various changes
Merge branch 'master' of https://github.com/ericfialkowski/500px-api

Conflicts:
	.gitignore