Merge pull request #34 from ospreys-2014/model_migration

Model migration
formating and update of artist display
styling changes to user show
Merge pull request #36 from ospreys-2014/artist_profile

Artist profile
updates to include Travis CI
Merge pull request #37 from ospreys-2014/artist_profile

updates to include Travis CI
stuff
Merge pull request #38 from ospreys-2014/user_branch

stuff
review tests