Cleaned out unused code
Merge branch 'master' of https://github.com/hilja/album

Conflicts:
	.gitignore
	album.sublime-workspace