Merge branch 'master' of https://github.com/peateas/felix-features-2013

Conflicts:
	features/user_books_a_trip/user_picks_a_trip/user_specifies_passenger_counts.feature