Switched back to aweplug/master
Updated Gemfile.lock
Merge pull request #550 from paulrobinson/move_back_to_aweplug_master

Switched back to aweplug/master