pile o changes to make typeahead work.  needs some cleaning
please merge editable-entries plz

Conflicts:
	app/controllers/entries_controller.rb
changing icons around
Merge remote-tracking branch 'upstream/development' into super_merge_test

Conflicts:
	app/assets/javascripts/application.js
Merge pull request #52 from jbrewton/super_merge_test

Super merge test