added .bundle
Merge branch 'master' of github.com:rheikvaneyck/rnexus

merge github to local
added local fixes
fixed merge
refactored server configuration, switched to unicorn