Added iCal feed
Added inline topic to meeting admin
Changed topic admin to show if it's been approved and which meeting
Added twitter feed for '#ChiPy python' to the home page
Changed the twitter feed to check @brianray tweets with #ChiPy
Merge pull request #58 from ConceitedCode/develop

Added iCal feed
Merge pull request #59 from ConceitedCode/inline-topic

Added inline topic to meeting admin
Merge branch 'topic-admin-list' of github.com:ConceitedCode/chipy.org into ConceitedCode-topic-admin-list

Conflicts:
	chipy_org/apps/meetings/admin.py
Merge pull request #62 from ConceitedCode/twitter-feed

Added twitter feed
Use unicode for ical description
Merge branch 'develop'
Ical feed description to handle no presentors
Merge remote-tracking branch 'origin/develop'