Clean up changes from rebase master.
Add comments, clean up so rspec test runs.'
Modify Chirp::Picture#get_picture method to return URL without second API call.
End of day commit. Fix Chirp::Picture#get_picture to return url in one API call. Unfinished test for Chirp::Picture.
'Finish' Chirp::Content class, tie in with birdmain.rb. All untested, likely bugs.
Move API calls to their own methods, add method comments.
Merge branch 'master' into flickr-api

Conflicts:
	birdmain.rb
	lib/birdwatch.rb
	public/geo.js

Updated flickr-api to take master branch changes including layout, geolocation, and running on sinatra fixes.
Update .gitignore
Fix birdmain.rb to exclude non-functinal flickraw code. Current code takes location and returns info from Cornell API.
Add passing test for Chirp::Content.initialize
Refactor/Fix Chirp::Content#get_picture into #flickr_call and #get_pic_url. Working!
Fix Chirp::Content module such that the Flickr API call works and the results page (birdlist.erb) is dynamically populated with information from both the Cornell and Flickr API's.