add ordered waypoints
Merge branch 'master' of https://github.com/sgarcese/RailsOptiRoute

Conflicts:
	lib/google_api.rb
add <script> tag to application layout with key to enable js to get maps from google