refactored some of the base stuff
Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/mobilize.rb