built structure for updating user location
added functionality to update user location via form submission which, upon success, resets userData then recenters the map and shows events
added spec to validate that the users#update route responds successfully when passed valid attributes
Merge branch 'master' into update_user_preferences

Conflicts:
	app/assets/stylesheets/styles.css
added settings icon to directory and to the layout view; added toggleSettingsButton function in session view
added listener on settings icon that toggles the update location form on click
mouse turns to pointer when hover over large infobox close button
Merge branch 'master' into update_user_preferences

Conflicts:
	app/assets/stylesheets/styles.css
update settings will clear when other forms are rendered and other forms will clear when settings form rendered
GREEN fixed user login and sign up capybara tests, now stubbing songkick api calls
Merge branch 'master' into update_user_preferences

Conflicts:
	app/assets/stylesheets/styles.css
added test to user_controller_spec to make sure users location is correctly reassigned
Merge branch 'master' into update_user_preferences
Merge pull request #69 from pocket-gophers-2014/update_user_preferences

Update user preferences