added basic user setup
added artist and album model, plus specs
added useralbums and specs
fixed album model and spec
fix merge conflicts form user_pages pull_request
change album title to name for consistency
first_or_create for histories sake
Merge branch 'development' of github.com:jeroenstevens/amnesia.fm into development
update gitignore to ignore solr and coverage