Style Guide 9/8/2014

In ruby we never use camelCase for args. Switch to snake_case. Also, I think those @-symbols are unnecessary.