Merge pull request #60 from red-admirals-2014/map_form

Map form
map now has info windows
Merge branch 'master' into display_map_cards
Merge pull request #61 from red-admirals-2014/display_map_cards

Display map cards
Got map form functionality working. Needs styling
Merge branch 'master' into map_form
Updating branch before pushing