Merge pull request #172 from tispratik/master

Fix rake db:migrate because of factory girl error
Misc refactorings on angular app
Merge pull request #173 from functioncallback/master

Misc refactorings on angular app
Scope to Service to Scope data array working - but not yet quite right
$scope.$watch now getting scope to service to scope updating
Working with $location
Merge pull request #174 from kimardenmiller/Angular-Scope-Service-Scope-Roundtrip

Scope to Service to Scope data array working - Code Generally Cleaned up and ready for rebasing by other contributors.
Initial Proposal Detail Page Working
Merge pull request #175 from kimardenmiller/proposal_details_page

Initial Proposal Detail Page Working