accidentally left @account=Account.first...removed and set to real account id
Merge branch 'master' into upstream_merge
merging
Merge pull request #43 from nickpassarella/master

Fixed issue with assigning account in ordered items controller