update prompts for clarity
fix merge conflicts
fix budget prompts
change prompts for add trip/wishlist forms
Merge pull request #131 from mud-turtles-2014/more_fixes

Style delete buttons
Remove extra explainer text
Add extra link to trip conversion
remove back to search link
Added ids to elements
Add JS to appear/hide on click
Fixed merge conflict
Merge pull request #132 from mud-turtles-2014/fixes

Fixes
fix sidebar scroll to show logout
Merge branch 'master' of https://github.com/mud-turtles-2014/GoBug
Merge branch 'master' into more_fixes

Conflicts:
	app/views/users/_expenses_list.html.erb
Fix merge conflict