add waffle.io badge
Merge pull request #34 from waffle-iron/master

waffle.io Badge
Merge pull request #33 from lukeaiken/map_2

Map 2
move javascript libraries out of app folder
rvmrc
move files back
map markers displaying atmention text on click
map markers displaying at mention text and author on map
merged in master
Merge pull request #35 from lukeaiken/map_3

Map 3
merged in master
Merge branch 'posting_a_tweet_via_angular' of https://github.com/lukeaiken/social_smarts into posting_a_tweet_via_angular