Merge pull request #26 from tbuchanan/master

pull
random
resolving conflicts
cleaned up commented out code
fixed search query to be case-insensitive
added a form for posting new popups
got the get directions link to work on map, also made some changes to placement of content
some stylistic changes, cleaned up controller and added code for current user in show method, made some changes to overall layout
changed website link on showpage
merged pull request from tyler
commit before group pull
resolved conflicts