updated map styles
Merge pull request #14 from hartsick/master

google map stylized
Merge pull request #15 from hartsick/user

Merge pull request #14 from hartsick/master
map stylized with off-canvas menu
Merge branch 'user' of github.com:hartsick/pLAy-music into user
Merge pull request #16 from hartsick/user

User
create playlists model, users/routes/playlists associations
add song/playlist/route relations, basic playlist generation rake task
show routes dropdown on user signin
Merge branch 'master' into generate-playlist

Conflicts:
	app/views/layouts/_nav.html.erb
Merge pull request #17 from hartsick/generate-playlist

Generate playlist
update playlists rake
Merge branch 'master' into rdio-integration
add task: get rdio_id from echonest search