Merge branch 'master' into topics/image_uploads

Conflicts:
	.gitignore
	lalala-ng.gemspec
	lib/lalala.rb
Merge branch 'topics/image_uploads' of github.com:mrhenry/lalala-ng into topics/image_uploads
Cleaned up the image uploader