Merge pull request #200 from RyanTG/master

added new description to edit machine comment
move cucumber test to capybara/rspec
Merge branch 'enhancements'
switch geocoding service to google
Merge branch 'enhancements'
used html5 placeholder tag on machine condition textarea