Merge pull request #59 from red-admirals-2014/small_map_update

Fixed form bug and adding form to map view
Working on form for map view
Merge branch 'master' into map_form
Making sure branch has up-to-date master